Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(sync-translated-content): gather releated upstream commits #18427

Merged
merged 4 commits into from
Mar 7, 2024

Conversation

yin1999
Copy link
Member

@yin1999 yin1999 commented Mar 6, 2024

Description

gather releated upstream commits


Tested in my fork, check branch: https://github.com/yin1999/translated-content/tree/test-gather-urls

workflow run: https://github.com/yin1999/translated-content/actions/runs/8182413701

screenshot:

image

image

Related issues and pull requests

#9199 (comment)

@github-actions github-actions bot added the system Infrastructure and configuration for the project label Mar 6, 2024
@yin1999 yin1999 force-pushed the generate-upstream-commit branch from 99d9f6c to e449f85 Compare March 7, 2024 01:06
@yin1999 yin1999 marked this pull request as ready for review March 7, 2024 01:30
@yin1999 yin1999 requested a review from a team as a code owner March 7, 2024 01:30
@yin1999
Copy link
Member Author

yin1999 commented Mar 7, 2024

ping @OnkarRuikar, @bsmth for a review :)

Copy link
Contributor

@OnkarRuikar OnkarRuikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit

.github/workflows/sync-translated-content.yml Outdated Show resolved Hide resolved
@OnkarRuikar
Copy link
Contributor

For testing all the changes so far is it possible to do following in your forks main branch?

git reset --soft HEAD~1
git stash save "my workflow change"
git reset --hard 8fc08d671390ffb07761a3aeb31e6284ceeba20f
git stash pop
git commit -am "feat(sync-translated-content): gather releated upstream commits"
git push --force

Re-trigger the workflows on GitHub. This gives us more commit URLs to test.

To bring back the fork to normal in local as well as on github:

git reset --soft HEAD~1
git stash save "my workflow change"
git pull mdn-translated-content main
git push --force

@yin1999
Copy link
Member Author

yin1999 commented Mar 7, 2024

For testing all the changes so far is it possible to do following in your forks main branch?

git reset --soft HEAD~1
git stash save "my workflow change"
git reset --hard 8fc08d671390ffb07761a3aeb31e6284ceeba20f
git stash pop
git commit -am "feat(sync-translated-content): gather releated upstream commits"
git push --force

Re-trigger the workflows on GitHub. This gives us more commit URLs to test.

To bring back the fork to normal in local as well as on github:

git reset --soft HEAD~1
git stash save "my workflow change"
git pull mdn-translated-content main
git push --force

Done in main branch, see workflow run: https://github.com/yin1999/translated-content/actions/runs/8182413701

Copy link
Contributor

@OnkarRuikar OnkarRuikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yin1999#41 looks great!

Copy link
Member

@bsmth bsmth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Looks good! 👍🏻

@yin1999
Copy link
Member Author

yin1999 commented Mar 7, 2024

Thank you @OnkarRuikar, @bsmth. I'm going to merge this shortly and have it a test in this repo after 🚢

@yin1999 yin1999 merged commit 0ecc1c8 into mdn:main Mar 7, 2024
7 of 8 checks passed
@yin1999 yin1999 deleted the generate-upstream-commit branch March 7, 2024 11:33
@yin1999
Copy link
Member Author

yin1999 commented Mar 7, 2024

It works well, see workflow run: https://github.com/mdn/translated-content/actions/runs/8187433241

ciyoe pushed a commit to ciyoe/translated-content that referenced this pull request Apr 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
system Infrastructure and configuration for the project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants